Add commodity constraints input and validation - #1487
Merged
Conversation
Contributor
Author
|
@tsmbland I've taken a stab at this but some feedback would be helpful before I add tests |
tsmbland
reviewed
Aug 14, 2026
tsmbland
left a comment
tsmbland
left a comment
Collaborator
There was a problem hiding this comment.
Good start, but a few comments
- Cleaner parsing of region_id - Change units of limits from money to flow - Store time slice selection and balance type in `CommodityConstraint` struct - Store vectors of `CommodityConstraint`s in `CommodityConstraintMap`
dc2917
force-pushed
the
add-commodity-constraints-input-and-validation
branch
from
August 25, 2026 16:23
c872f0a to
273b323
Compare
dc2917
force-pushed
the
add-commodity-constraints-input-and-validation
branch
from
August 25, 2026 16:28
273b323 to
328243d
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1487 +/- ##
==========================================
+ Coverage 90.31% 90.35% +0.03%
==========================================
Files 60 61 +1
Lines 8663 8850 +187
Branches 8663 8850 +187
==========================================
+ Hits 7824 7996 +172
- Misses 525 529 +4
- Partials 314 325 +11 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
dc2917
force-pushed
the
add-commodity-constraints-input-and-validation
branch
from
August 26, 2026 07:50
be131f2 to
03f77ef
Compare
dc2917
marked this pull request as ready for review
August 26, 2026 07:51
tsmbland
requested changes
Aug 26, 2026
tsmbland
left a comment
tsmbland
left a comment
Collaborator
There was a problem hiding this comment.
Looks very good on the whole, just a few suggestions
tsmbland
approved these changes
Aug 26, 2026
tsmbland
left a comment
tsmbland
left a comment
Collaborator
There was a problem hiding this comment.
Looks good!
Still a small error in the tests. As I don't think it affects the validity of the tests I'll approve, but probably worth fixing up for the sake of correctness!
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR adds a new module for reading and validating an input csv file for commodity constraints.
Commodity constraints are stored in a new
CommodityConstraintstruct, and the set of constraints provided are read and stored in aCommodityConstraintsMaptype, which mapsCommodityConstraints by region ID and year.CommodityConstraints have a single field,limits, which stores the range of values to which the commodity is constrained.An example commodity_constraints.csv file has been added to the "simple" setup for demonstration, and a corresponding schema has been added.
Fixes #1448
Type of change
Key checklist
$ cargo test$ cargo docpresent in the previous release
Further checks